Now with proper debugging