Updated to Revision 358/359