some changes in core