end of modification wrt 2.4 version