remove debug. do highlight better