Small work done on gen refactor.