some changes, new view from Nadja Added