Adds new searching style
Merges with master