partial commit
stable version, association tool+fixed bug