More updates for issue #14