tweaks to meet ez pattern