updated to final draft