Speeding things up a bit!