added 2.2.5 changes