Adapting after feedback from Greg