[FACTOR] New update logic [Incomplete]