Changed my functions to match Michelle's email specs