updated to include new functions for 2.5.0