Changes in avecom and added oneway.R