Now with less debug logs