final beta 2.1 changes