Simplified the debug stuff