V1.2 merge - add delay and days ahead options