added uppercase checking