Changed a few things
removed some misplaced code