updated for 2.5.0