moving to mail package and changing input args