Endre branch

Endre has done some changes yeah.