updated register
fixed merge-bug