Slimmed/refactored