updated 2011-Nov-12

continued