Updated to Revision 388