Removed s0 and r0