Now understands uppercase