Updated register logic