Added location logging,