updated debug from improved class