Changed alot of things