Added the location helper to reflect the location