Rfang branch

AR1 pull request