moved alot of stuff around