Changes motivated from reviewer comments