removed a lot of the blah code