Switch to using an ItemModifier instead of a macro