Minor refacto
Data transfer demo