transaction relatioships updated and tested
Merge branch 'manny'