added TODO, debug state generation