Small changes to run this and add some commits
Merge changes