stuff
some changes, grrrrrr