updated for 2.2RC2