Preparations for next changes