Adding initial 2.4 code