Tweaks; worked on ATAGs support