Update from 1.07 original to 2.06 sources