more xcomposite wip