merge and some more additions