Final changes to ENCODER.R for new release