added makeSubmission and changed the structure