updated to the latest version -with buttons for delte location