Added better views; simplified