more mapping changes