Adapt to new view