Incorporated feedback from the team