Updated so it keeps track of UPPERSCASE