added uppercase support