Updated views, for Friday demo