Updated Update method, needs code review