Updating to handle mixed use of case