Going Version 1, because it now does what it should