Final changes to complete issue #9