Changes to Update Functions