Debug functions commented