Added some of the location shit