Update to 2.5.0, reorganized code
Slight change in times, fixed for 1.7