Added debuggy stuff