improve wa output somewhat at the cost of awful compexity