speed up
a few changes