Updated find node code