Minor changes after re-write to implement gap filling using ACCESS data