Fixed on one, I'm going to keep the second because I didn't want to couple it too tightly to the UI where we have to make tons of changes whenever we change wording in RPM.