Update to Rev. 20