added and got rid of alot of functions