Modified builder.php