adjusted views and not done yet