merged some issues