Updated with feedback from Jake