feedback from laura fixes