Improvements from Sherlock