Update to views and tested