Closes issue #1 6.1, 6.3, 6.4, 8.1