encoder changes and comments