Updating to run over 24 months and retest across archive