better mapping, next to do prev and future line refinement