Updated with SplitString