Simplified everything!