Part of previous commit, these three views were left out (as usually!)