updated data input processing
fixed merge conflict