small changes per mccloy