bug fixies. commit before change assoaciation
aaa