Updated views and logic.