Update to cope with submission format