made it compatible from 2.4 to 2.5