some changes in core
some changes
added helper