changed stuff around and bumped