This is the most significant change from the version prior to 1.10