Added ACIP code and some comments