Issue #247
commented the new code in the controller in order to avoid bugs. will be uncommented at a more advanced level