Updated base.php