Change update machanism more efficiently