Addressing tasks in issue #32