delta: safety system added (untested draft)