Adds finding key
Refactors 1.6