updated based on team review