merged some things