added more logic for Ping and MAC finding