modify some things from core