Modified Update method