Removed check and refactored set