Changing callback, adding text email support