Split out EDW functions