Updates following feedback in team meeting