Manually merged Or's stuff with mine.

Hope all is good...