-- merging in changes from lgrapenthin