added 2.5.17 (rough draft?)