Simplified version