update to 2.2 (cont)