Add debug logs
Update debug statements for clarity