changes suggested by carrigan