Added tracking of location