Both volunteer and client submissions working