New version with submission