updates for speed fix's