changes for 1.096