Razor almost there, still a bit slow