Rewrite for Version 2.0