Edits from Miguels comments