some edited stuff