included corrections and comments from Daniela