bring it closer to the main version, fix deletion issue