update to regex for hw and key indetification