Improvements to the sketch