Added some ninja-stuff, like delete