cleaned 2.4 version