According to model/controller model
Removed garbage matrices
Merge conflict solved