Incorporated feedback, removed function section