add checking of digits, abbreviations and letters in uppercase