Version 2. Overhaul features.