Minor modifs to address Issue #8