merged some more