Mark - Defensive changes