Additional updates to reflect char order