update main brach to final beta

final beta