Updated to 2.2 ALFA