Apply feedback from Chris.