added email capture override - not finished, commented out