merged with beta