Build the Future 22598

Optimizing the Future 21517