modification 1 for PR#5996