simplified everything :D