changed alot of stuff