added debug data to be removed