Merging 2.4