stripped out a bunch more stuff