Initial dist subtree commit
Modifications