further updates to transfer flow