incorporated feedback from dev review