Initial vesion (without long running transactions)