Fine tuned update functionality