some changes with mapping