implemented changes in core