Updated generator to properly load encoder values?