fix issue in input data
little adjustment to fix data format in input data
commit after refactoring
integrated latest changes from dnet40