hopefully speeding things up even more