last round of debugging