readded new transfer concept with feature toggle