Fixed MTV
Fixed Merge Conflicts