Updated with revised plan