Should remove WAVED here.