Changed splitting of cases to support RFC####