making ajusts
#60 implementing email engine