restoring lines (nearly)
applying mvc