Added constant fields to Solution_2 so that is is more scalable.