Updated to be only apply views when required