Added not-so-passive info gathering