Safe data transfer (18/20)

Safe data transfer