simplified everything