Updated Estimation and Project Plan