implementing comments from Daniela