last changes suggested by chandra.