Debug Logger
Fix Logic