Make things run
Merge changes