added better submittin