since you're changing those anyway, could you put them in alphabetical order?