Added old views
resolved merge conflict