rejigged everything