Changes as requested in the mail