Re-added marking feature that was accidentally deleted