New debug
Improving debug
Fixing conflicts