pre-1.06 commit