Improving EdgeNodes solution