made alot of changes...