Updated to Revision 318