Changes in issue 6