more changes to 2.2