Added upper/lowercase acceptions