Restructuring so addition models can be used.