Integrating Geoff's changes...