changed from .find to use if/in