added submission handling for more options