Branch nr1

I made some changes; Pls review.