added stuff and removed