Better debugging still