merged files for github sync
another attempt at merging tx1 & tx2