Simplified/refactored