Updated with the extra step