Some refactor around update logic