and remove conditional from view manager
simplify