updates for supporting issue #5.