Simplified everything