Update with refactored init.php