add check for data field and debug info