debug changes, more manual conversion