edited stuff