minor retooling