Updated includes.php for new system