Integrate changes described by Simon