pre merge, more debugging