added whiskering and unitors for composition