#251 Move to it's own UpdateView so doesn't slow everything down