Better. Now to document this...