Now runs properly after transfer