working on version for latest email format