total rewrite of includes + operators