addtional changes for sherpa2.1.1 update