Minor changes, new two-way-view