added some include logic for robustness