Making changes related to issue #7