Refactored; used txtdis_fx as dependency