Added alot of things