Faster validation?