First final version of data entry