Updated for pre-View build