use more advanced include logic