Updated with my feedback