Minor retooling