Revert "Revert "Marker Changes""

This reverts commit 029014df7170ba2dc0c7c511b7f3ad72c0291e81.