some changes from office machine