More things ...
merge done
new stuff..