fix mapping and implement bll
merge