Committing refactoring changes. Contains errors that will prevent complete execution of some functions.
Committing merge