major updates for version 2.0