Override Ezra's changes, List View added