Addressing issue #9 with respect to core code