Making check for other nodes smarter