Transactionalized more for consistency