Made a few changes to confirming