ACCF ready
Better comments