added changes from mail