Merged Ollis and mine