Heather.Syntax + clean deprecated syntax