More changes to SetMarker