Updated mail and all