fixed mapping and new results