speed-improvements1

speed improvements1