Necessary changes (2.20h)