Re-engineering for the Future: Optimizing Current Facilities