add comments
change dataconnectin handling
merge branch change_dataconnection_handling_method