Added Wei's changes to make ETRI work