email support added - to be tested