some more done on focus highlight