Update mapping s. #17,#43,#5