Address Feedback from Chris