updates based on cm hudson commit