changes for AR support