modify for newest Clighter