enhancement to ex-handling