Dealt with issues around atomic transactions