modified:   core.php