added alot of things