ETRO-6 add data dir back in