Updated with feedback from Jordan