Updated to handle more approvals