Further developed create by mail logic