Updated to rev. 996