new steve stuff
clean-up of broken code