included changings based upon discussions with the team