added highlighting to all
merge