Put coordinates back; added town support