diff --git a/database_maintenance/cycle_notification_history.sql b/database_maintenance/cycle_notification_history.sql
index 50b195e71..90028400d 100644
--- a/database_maintenance/cycle_notification_history.sql
+++ b/database_maintenance/cycle_notification_history.sql
@@ -26,6 +26,7 @@ CREATE TRIGGER update_pivot AFTER UPDATE OF notification_status, billable_units,
 FOR EACH ROW
   EXECUTE PROCEDURE update_pivot_table();
 
+
 -- Create foreign key constraints in notification_history_pivot using same names as used in notification_history
 ALTER TABLE notification_history_pivot ADD CONSTRAINT fk_notification_history_notification_status FOREIGN KEY (notification_status) REFERENCES notification_status_types(name)
 ALTER TABLE notification_history_pivot ADD CONSTRAINT notification_history_api_key_id_fkey FOREIGN KEY (api_key_id) REFERENCES api_keys(id)
@@ -34,8 +35,17 @@ ALTER TABLE notification_history_pivot ADD CONSTRAINT notification_history_key_t
 ALTER TABLE notification_history_pivot ADD CONSTRAINT notification_history_service_id_fkey FOREIGN KEY (service_id) REFERENCES services(id)
 ALTER TABLE notification_history_pivot ADD CONSTRAINT notification_history_templates_history_fkey FOREIGN KEY (template_id, template_version) REFERENCES templates_history(id, version)
 
+-- Index used for data population
+create index CONCURRENTLY created_id_nh on notification_history (created_at, id);
+
+-----
+
 -- Stage 2 - automated process
 
+cf run-task notify-cycle-history "flask command cycle-notification-history-table -l 100000 -s '2019-10-01 00:00' -e '2019-12-01 00:00'"
+ ... etc emd = May 11
+ ... On Monday - run again to get last nights inserts
+
 -- insert data into notification_history_pivot in batches
 -- This is handled by a python process
 
@@ -45,12 +55,26 @@ ALTER TABLE notification_history_pivot ADD CONSTRAINT notification_history_templ
 
 -- Run basic sanity checks on data in notification_history_pivot, ensuring same number of entries present in notification_history and notification_history_pivot
 SELECT COUNT(*) FROM notification_history_pivot;
-SELECT COUNT(*) FROM notification_history;
+SELECT COUNT(*) FROM notification_history where created_at >= '2019-10-01 00:00';
 -- Ensure these counts match.
 
+ALTER INDEX ix_notification_history_job_id RENAME TO ix_notification_history_job_id_old;
+ALTER INDEX ix_notification_history_reference RENAME TO ix_notification_history_reference_old;
+ALTER INDEX ix_notification_history_template_id RENAME TO ix_notification_history_template_id_old;
+
+CREATE INDEX CONCURRENTLY ix_notification_history_job_id ON notification_history_pivot (job_id);
+CREATE INDEX CONCURRENTLY ix_notification_history_reference ON notification_history_pivot (reference);
+CREATE INDEX CONCURRENTLY ix_notification_history_template_id ON notification_history_pivot (template_id);
+CREATE INDEX CONCURRENTLY ix_notifications_service_id_composite ON notification_history_pivot (service_id, key_type, notification_type, created_at);
+
 ALTER TABLE notification_history RENAME TO notification_history_old;
 ALTER TABLE notification_history_pivot RENAME TO notification_history;
 
+
+
+
+
+
 -- Run sanity checks on data in notification_history_pivot
 -- 1. Ensure same number of entries in notification_history and notification_history_pivot
 -- If not then reconcile entries and add remaining entries to notification_history
@@ -66,9 +90,9 @@ ALTER TABLE notification_history ADD PRIMARY KEY (id); -- Will create a new prim
 -- Create remaining indices on notification_history_pivot
 --- Create indexes after drop table since the names need to be unique
 --- Or rename these indexes (index names have to be unique in db)
-CREATE INDEX CONCURRENTLY ix_notification_history_job_id ON notification_history_pivot (job_id);
-CREATE INDEX CONCURRENTLY ix_notification_history_reference ON notification_history_pivot (reference);
-CREATE INDEX CONCURRENTLY ix_notification_history_template_id ON notification_history_pivot (template_id);
-CREATE INDEX CONCURRENTLY ix_notifications_service_id_composite ON notification_history_pivot (service_id, key_type, notification_type, created_at);
+CREATE INDEX CONCURRENTLY ix_notification_history_job_id ON notification_history (job_id);
+CREATE INDEX CONCURRENTLY ix_notification_history_reference ON notification_history (reference);
+CREATE INDEX CONCURRENTLY ix_notification_history_template_id ON notification_history (template_id);
+CREATE INDEX CONCURRENTLY ix_notifications_service_id_composite ON notification_history (service_id, key_type, notification_type, created_at);
 
 -- Note that the only impact of these changes