Added tweak for registration