Better Composites

Updated the composites to be more computationally efficient.