working on transactions handling