adding submission handling