updated to work with 2.5.0