responded to andreas's code review