Added current update logic back in