Simplified, updated