Updated with feedback changes