Even more better handling for multiple milestones.