s
big improvements in speed and searching