First round of debugging