Updated server side for the correct number of fields