Updates to the new view functions