Amends related to changing markers into a dict