[New] changes for some vies and functionality