changed a bunch based on email