massive improvement code highlight