Milestone 4.1: Optimization