merge Paul Blairs changes