port to wai-3