order and config
merged corrected encoding from master