Answer submission improved