Update for submission
Fix null id bug