Done.  Also improved the logic here a little bit.