version that addresses bill's comments, ish

Signed-off-by: Daniel Halperin <dhalperi@cs.washington.edu>