Remainder of the proposed changes.

Remainder of the proposed changes.

Worked perfect in WAS 8.5

Tks ^^