Refactored generate script- much faster, also added latest data with 3 months future