changes for making deletables work