added uplink to hardware id and reformat