Rearranged map for prototype milestone