finding now works much better