Replaced more trx DIY with startAtomic()