Preparing for 4.7