Version 2.2 changes