Additional work created by Leeway team members.