changed include logic