Add email field and correct calcution