updated version, trying location again