Updated and rearranged the map vars