Preparing for 1.6