Now uses correct generation settings when from the start