Yeah, added some extra debug stuff