Some modifications to the problem and objective function architecture.