improved mapping system