almost ready for version 2.0