Completed 2.4 and small fix for 2.2