simplified everything
more goodness