Changes as per AD (MArtin Stiemerling