NEW: applied DRY to important and confusing markers as well