Many planning improvements.