Copy changes as per Dan

Issue: #15