Updated for confirmation dialog and xxxFileName macro