email improved but not finished