Quick commit with base.php updates