Tried speeding things up