BETA2: main changes