fixed data loading, and specified a timeframe