merged some changes