improved support for reset and submit for approval