updates to allow for serving mail