Fixed Function issues with final draft