few changes according to team review