put back some minor changes