Made alot of changes