Added location to variables as well