Redid USN parsing