incorporate notes and comments