changes up to 3.6