Improvements to nick change...