Should be final draft, comments added