added stuff and such