code final beta 2.1