reworked highlighted class