Removed update all logic