latest changes --- are we done?