deleted alot of code