Updates to be in accord with 06/13/13