Added location changing functionality