speeding things up a bit