Updated plan for 2.5.2