removed certain things, got new ones