merge with beta2