Improvements based on Nick's CR