next changes to fix the output