ri2 -> ri
Adding missing skills, alphabetizing