changed based on code review