added August's changes from Reed.