long run commit
Some minor changes
Some minor changes