duplicated work submission
need to refactor form