Improved code design + NIC choice