change to new mapper