DF-4500 - updated according to review comments.