Improve confirmations