may have improved speed of general case