Added (some) non-orthongonal view code?