Merged some changes