Added logic and number highlighting