New macro to handle uppercase text