Stage 7: Transaction & bug fix