preparing for 0.6