rejigged for sanity