more speed imporvments