Tweaks to ATR