Update for 2.2

First update for 2.2