include logic improved
include logic improved