Made transactions work.
resolved conflict with master