rejigged things a little bit