changes from feedback from Julien