Improved registration