Preparing for 0.6