Added loading of r_{in/out} variables but not switched it on; also carrying out additional check to ensure convergence