more mapping updates