nightly changes
new series modification and rake_time conflict fix