08092013 finished incorporating rafe's edits