Matching official structure, take 2.