Finish highlight logic, no animations