Removed some debug code and allowed the location to change