Added partially working data transfer