Correct milestone order and milestone creation