minor changes
encoding considered