Inbetween commit for Harold.