encoding back to old version & minor reverts