Added a better map, and a confirm before uploading!