Update for 2.2 and clean tab