Fix logics, test mapping.