start of upgrade to 1.9