Added confirmation and fixed numbering again