Addressed all of Jay's feedback