Re-order planned checks based on what a 3.0 would need