updated with latest from the team