included christophers displacement (untested)