Data transfer fixing
Testing version