Improved Edit()
Improved Death Check