Updated AEP engine, submitted by Diarmuid O'Neill <Diarmuid.ONeill@aep.ie>