Changed integer to Location