Added better default location