more debugging
merged