better debugging
merged