Code is ready for version 2.0