updated functional submission form
merging conflicting branches