Updated with feedback from Andy.