Updating with new submit handler.