Speed

Speed improvements