Added coded copied from tutorial
Added code copied from tutorial
Changed the way the location is displayed