Very big changes in views
logs conflict