More updates to SubTeamDavid........