change object finding to a more simple solution