Add the final raw version -- the result is bad on sky, need more debug