simplified everything even more