Updates for alfa testing 2.2