addressed a bunch of feedback from Greg