Fixed transfer functionality!