Some fixes, parameters set, so that r=3