Hopefully increases performance on searches...
resolves merge- conflict