changed back to the old mapping functions