Adding debug lines back :(