*more changes on DO-4885