Core function changed