More tuning on the mac addresses