Added views conditional