Changes to #6