changed builder order so that the required fields are first