merge current assockit from CVS, not yet enough