Simplified everything
Simplified a lot