Separated forms and added comments to CAI one