Updated to Revision 268/269