Restrain/Refactored