Preparations for 3.3