added stuff and deleted stuff