Implementing the new roadmap