changes to reg
Merge branch 'regupdate'