adding uppercase support