Incorporated feedback from Masters