Updated for revision 170