Fixed the regression fault by bringing back the views...