New upcase logic