Changing some cases around