Updates for issue #5