Adding debug ability