Master version, without hard-coded login or dummy location