Update Logic v.2