marginal code optimisation
add MAC address search functionality