add FIXME: testing speed up