Finish empty-fields part 1