beter peformece in core files.