Final commit to move to AS