more changes towards 2.2