Improvements to Sheriff Hat