AR fixed & some improvements