change OBCForm Model to be closer to the actual form