added a lot of stuff
added stuff