*more changes on DO-3873