Added logic to include all columns and values
Commented out some console.logs