Add TODO
Avoid unnecessary checks and updates