Tried to improve the scaling and some of the flow of composite.py