Update Optomizations