Reg refactor take2 ian

yes, good catch!