addition of range highlight
and some modification