Improved cancelling by new lock, should make it even more snappier