Moved debug variables around