did some changing around of things
BLAh