ipdb breakpoint
Some minor changes
Merge