Preparing for 1.6 fluid transition