Updates to base.php