Added uppercase checking