gap filling variable count of source stations; package reorganisation