11 Commits (fixDataView)