Changes as per Adam's feedback.