more mapping and change model