Merged branch with improved view.