catching up: several changes