Finished combining Location and Water