incorporated feedback changes