for version 2.0-BETA6