Smart. Filed as #170