adding more eh code