Change location to use hash