Refactor generator to NOT use log(), due to precision issues...