Implement changes requested in #5