Improved interaction between Controller and Algorithms
Merged files