Changed the rdev code to have both an "rdev" variable (which always