updated locations; added java